gui/macOS: Correctly release objects received via FileProviderUtils functions

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/src/gui/macOS/fileprovideritemmetadata_mac.mm b/src/gui/macOS/fileprovideritemmetadata_mac.mm
index ec96674709ea4551eb53d830e368292ede0fbe33..8ff39979f9113eeaf992a7e505d91e28b5346cce 100644 (file)
--- a/src/gui/macOS/fileprovideritemmetadata_mac.mm
+++ b/src/gui/macOS/fileprovideritemmetadata_mac.mm
@@ -147,6 +147,8 @@ QString FileProviderItemMetadata::getUserVisiblePath() const
     dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
     dispatch_release(semaphore);
 
+    [manager release];
+
     return returnPath;
 }
 

diff --git a/src/gui/macOS/fileprovidermaterialiseditemsmodel_mac.mm b/src/gui/macOS/fileprovidermaterialiseditemsmodel_mac.mm
index b2fe54011e0258751abbbff2cb05234621bf65e0..cfa73a14a498b4a4d3487845f7d01e3f83d8713d 100644 (file)
--- a/src/gui/macOS/fileprovidermaterialiseditemsmodel_mac.mm
+++ b/src/gui/macOS/fileprovidermaterialiseditemsmodel_mac.mm
@@ -59,6 +59,8 @@ void FileProviderMaterialisedItemsModel::evictItem(const QString &identifier, co
     }];
 
     dispatch_semaphore_wait(semaphore, dispatch_time(DISPATCH_TIME_NOW, 3 * NSEC_PER_SEC));
+    [manager release];
+
     if (successfullyDeleted == NO) {
         return;
     }

diff --git a/src/gui/macOS/fileprovidersettingscontroller_mac.mm b/src/gui/macOS/fileprovidersettingscontroller_mac.mm
index d1fd68e69cd81cb00d4337f919e52953b5b4c13b..89e1b76e2b5b8ece555993c916a1e2cca3a912e6 100644 (file)
--- a/src/gui/macOS/fileprovidersettingscontroller_mac.mm
+++ b/src/gui/macOS/fileprovidersettingscontroller_mac.mm
@@ -167,6 +167,7 @@ public:
         qCInfo(lcFileProviderSettingsController) << "Signalling file provider domain" << userIdAtHost;
         NSFileProviderDomain * const domain = FileProviderUtils::domainForIdentifier(userIdAtHost);
         NSFileProviderManager * const manager = [NSFileProviderManager managerForDomain:domain];
+        [domain release];
         [manager signalEnumeratorForContainerItemIdentifier:NSFileProviderRootContainerItemIdentifier
                                           completionHandler:^(NSError *const error) {
             if (error != nil) {
@@ -186,6 +187,7 @@ public:
     }
 
 public slots:
+    // NOTE: This method will release the provided args so make sure to retain them beforehand
     void enumerateMaterialisedFilesForDomainManager(NSFileProviderManager * const managerForDomain,
                                                     NSFileProviderDomain * const domain)
     {
@@ -228,6 +230,9 @@ public slots:
 
             [storageUseObserver release];
             [enumerator release];
+
+            [managerForDomain release];
+            [domain release];
         };
         [enumerator enumerateItemsForObserver:storageUseObserver startingAtPage:NSFileProviderInitialPageSortedByName];
     }
@@ -283,7 +288,8 @@ private:
                                                                 << ", returning early.";
                     return;
                 }
-
+                [managerForDomain retain];
+                [domain retain];
                 enumerateMaterialisedFilesForDomainManager(managerForDomain, domain);
             }
         }];

diff --git a/src/gui/macOS/fileproviderutils.h b/src/gui/macOS/fileproviderutils.h
index 063be6d6d4d727e0f3c6a46a7f345f472007d6e0..8a710fccf960206480b318dcf4e3ef9a381bf587 100644 (file)
--- a/src/gui/macOS/fileproviderutils.h
+++ b/src/gui/macOS/fileproviderutils.h
@@ -29,6 +29,10 @@ class QString;
  *
  * You should threfore try to avoid using this in C++ code wherever possible
  * and only use this in *_mac.mm implementation files.
+ *
+ * IMPORTANT: All Objective-C objects returned here need to be released!
+ * They have been internally retained due to the async nature of the
+ * FileProvider API.
  */
 
 namespace OCC {